From d55da3fd4411f35ea96aa86b92cb7b04c9f4c738 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 11 Mar 2018 00:29:46 -0500 Subject: [PATCH] Use GtkSnapshot getters We can avoid direct struct access and gtksnapshotprivate.h everywhere. --- gtk/gskpango.c | 4 ++-- gtk/gtkcssimage.c | 2 +- gtk/gtkcssimageprivate.h | 2 +- gtk/gtkcssshadowvalue.c | 6 +++--- gtk/gtkiconview.c | 2 +- gtk/gtkmagnifier.c | 4 ++-- gtk/gtkoverlay.c | 4 ++-- gtk/gtkrenderborder.c | 2 +- gtk/gtkrendericon.c | 2 +- gtk/gtkstack.c | 4 ++-- gtk/gtktreeview.c | 2 +- gtk/gtkwidget.c | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtk/gskpango.c b/gtk/gskpango.c index 04b58f566e..e293759d2d 100644 --- a/gtk/gskpango.c +++ b/gtk/gskpango.c @@ -21,7 +21,7 @@ #include "gsk/gsk.h" #include "gskpango.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include @@ -155,7 +155,7 @@ gsk_pango_renderer_show_text_glyphs (PangoRenderer *renderer, if (node == NULL) return; - if (crenderer->snapshot->record_names) + if (gtk_snapshot_get_record_names (crenderer->snapshot)) { char name[64]; g_snprintf (name, sizeof (name), "Glyphs<%d>", glyphs->num_glyphs); diff --git a/gtk/gtkcssimage.c b/gtk/gtkcssimage.c index 6d0f449803..eee9c5c0d8 100644 --- a/gtk/gtkcssimage.c +++ b/gtk/gtkcssimage.c @@ -22,7 +22,7 @@ #include "gtkcssimageprivate.h" #include "gtkcssstyleprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" /* for the types only */ #include "gtk/gtkcssimagecrossfadeprivate.h" diff --git a/gtk/gtkcssimageprivate.h b/gtk/gtkcssimageprivate.h index e4b06e2e75..bb88d1c5f3 100644 --- a/gtk/gtkcssimageprivate.h +++ b/gtk/gtkcssimageprivate.h @@ -25,7 +25,7 @@ #include "gtk/gtkcssparserprivate.h" #include "gtk/gtkcsstypesprivate.h" -#include "gtk/gtksnapshotprivate.h" +#include "gtk/gtksnapshot.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index c81d82b405..eb5b560c6b 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -24,7 +24,7 @@ #include "gtkcsscolorvalueprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssrgbavalueprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkstylecontextprivate.h" #include "gtkpango.h" @@ -1053,7 +1053,7 @@ gtk_css_shadow_value_snapshot_outset (const GtkCssValue *shadow, _gtk_css_number_value_get (shadow->voffset, 0), _gtk_css_number_value_get (shadow->spread, 0), _gtk_css_number_value_get (shadow->radius, 0)); - if (snapshot->record_names) + if (gtk_snapshot_get_record_names (snapshot)) gsk_render_node_set_name (node, "Outset Shadow"); gtk_snapshot_append_node (snapshot, node); gsk_render_node_unref (node); @@ -1084,7 +1084,7 @@ gtk_css_shadow_value_snapshot_inset (const GtkCssValue *shadow, _gtk_css_number_value_get (shadow->voffset, 0), _gtk_css_number_value_get (shadow->spread, 0), _gtk_css_number_value_get (shadow->radius, 0)); - if (snapshot->record_names) + if (gtk_snapshot_get_record_names (snapshot)) gsk_render_node_set_name (node, "Inset Shadow"); gtk_snapshot_append_node (snapshot, node); gsk_render_node_unref (node); diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index e03640344a..b0d5ae756d 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -41,7 +41,7 @@ #include "gtkprivate.h" #include "gtkscrollable.h" #include "gtksizerequest.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkstylecontextprivate.h" #include "gtktreednd.h" #include "gtktypebuiltins.h" diff --git a/gtk/gtkmagnifier.c b/gtk/gtkmagnifier.c index cc4e85081d..875342a463 100644 --- a/gtk/gtkmagnifier.c +++ b/gtk/gtkmagnifier.c @@ -19,7 +19,7 @@ #include "gtk/gtk.h" #include "gtkmagnifierprivate.h" #include "gtkwidgetprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkintl.h" enum { @@ -116,7 +116,7 @@ gtk_magnifier_snapshot (GtkWidget *widget, g_signal_handler_block (priv->inspected, priv->draw_handler); inspected_snapshot = gtk_snapshot_new (gtk_snapshot_get_renderer (snapshot), - snapshot->record_names, + gtk_snapshot_get_record_names (snapshot), NULL, "MagnifierSnapshot"); diff --git a/gtk/gtkoverlay.c b/gtk/gtkoverlay.c index 90a930799b..fca3fb6098 100644 --- a/gtk/gtkoverlay.c +++ b/gtk/gtkoverlay.c @@ -25,7 +25,7 @@ #include "gtkscrolledwindow.h" #include "gtkwidgetprivate.h" #include "gtkmarshalers.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -676,7 +676,7 @@ gtk_overlay_snapshot (GtkWidget *widget, GtkSnapshot *child_snapshot; child_snapshot = gtk_snapshot_new (gtk_snapshot_get_renderer (snapshot), - snapshot->record_names, + gtk_snapshot_get_record_names (snapshot), NULL, "OverlayCaptureMainChild"); gtk_snapshot_offset (child_snapshot, main_alloc.x, main_alloc.y); diff --git a/gtk/gtkrenderborder.c b/gtk/gtkrenderborder.c index 8e9c059e07..132a30c21a 100644 --- a/gtk/gtkrenderborder.c +++ b/gtk/gtkrenderborder.c @@ -438,7 +438,7 @@ snapshot_frame_fill (GtkSnapshot *snapshot, gsk_rounded_rect_offset (&offset_outline, off_x, off_y); node = gsk_border_node_new (&offset_outline, border_width, colors); - if (snapshot->record_names) + if (gtk_snapshot_get_record_names (snapshot)) gsk_render_node_set_name (node, "Border"); gtk_snapshot_append_node (snapshot, node); gsk_render_node_unref (node); diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c index 77b80bad1c..4b411a8626 100644 --- a/gtk/gtkrendericon.c +++ b/gtk/gtkrendericon.c @@ -28,7 +28,7 @@ #include "gtkcssstyleprivate.h" #include "gtkcsstransformvalueprivate.h" #include "gtkiconthemeprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c index 172801e194..a14f4730d5 100644 --- a/gtk/gtkstack.c +++ b/gtk/gtkstack.c @@ -28,7 +28,7 @@ #include "gtkcontainerprivate.h" #include "gtkprogresstrackerprivate.h" #include "gtksettingsprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkwidgetprivate.h" #include "a11y/gtkstackaccessible.h" #include "a11y/gtkstackaccessibleprivate.h" @@ -1957,7 +1957,7 @@ gtk_stack_snapshot (GtkWidget *widget, gtk_widget_get_allocation (priv->last_visible_child->widget, &priv->last_visible_surface_allocation); last_visible_snapshot = gtk_snapshot_new (gtk_snapshot_get_renderer (snapshot), - snapshot->record_names, + gtk_snapshot_get_record_names (snapshot), NULL, "StackCaptureLastVisibleChild"); gtk_widget_snapshot (priv->last_visible_child->widget, last_visible_snapshot); diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e3657c9d92..c8be4bba9b 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -49,7 +49,7 @@ #include "gtkrendericonprivate.h" #include "gtkscrollable.h" #include "gtksettingsprivate.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkstylecontextprivate.h" #include "gtktooltip.h" #include "gtktreednd.h" diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index e78f66272d..72766c2c3c 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -60,7 +60,7 @@ #include "gtkselection.h" #include "gtksettingsprivate.h" #include "gtksizegroup-private.h" -#include "gtksnapshotprivate.h" +#include "gtksnapshot.h" #include "gtkstylecontextprivate.h" #include "gtktooltipprivate.h" #include "gtktypebuiltins.h" -- 2.30.2